From 788442db42d919bdc51e3ef859fc58a62c9fcf6a Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 12 Jun 1993 10:12:21 +0000 Subject: [PATCH] * config.h.in (HAVE_XRMSETDATABASE, HAVE_RANDOM, HAVE_LIBXBSD): Add #undefs for these. Dyke out code requesting -lXbsd and HAVE_RANDOM for XFREE386. * xfns.c (Fx_open_connection): Test HAVE_XRMSETDATABASE instead of NO_XRM_SET_DATABASE; the latter isn't used any more. * m/delta88k, m/tekXD88.h, s/linux.h, s/usg5-4-2.h (HAVE_RANDOM): Dyke out these #definitions; to avoid conflict with autoconf. --- src/config.in | 5 +++++ src/xfns.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config.in b/src/config.in index 9fad42a74cc..fe34dda65c4 100644 --- a/src/config.in +++ b/src/config.in @@ -97,6 +97,9 @@ and this notice must be preserved on all copies. */ #undef const #undef UNEXEC_SRC #undef HAVE_LIBDNET +#undef HAVE_XRMSETDATABASE +#undef HAVE_RANDOM +#undef HAVE_LIBXBSD /* If using GNU, then support inline function declarations. */ #ifdef __GNUC__ @@ -186,6 +189,7 @@ and this notice must be preserved on all copies. */ #endif #endif +#if 0 /* This should be taken care of by autoconf now. */ /* joe@zircon.uucp says that in order to use XFree386, you have to link against -lXbsd, which insists on defining the random function. @@ -196,6 +200,7 @@ and this notice must be preserved on all copies. */ #define LIBX11_SYSTEM -lXbsd #define HAVE_RANDOM #endif +#endif /* Some of the files of Emacs which are intended for use with other programs assume that if you have a config.h file, you must declare diff --git a/src/xfns.c b/src/xfns.c index 994d749d6a5..6b1eb465b2c 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3477,7 +3477,7 @@ arg XRM_STRING is a string of resources in xrdb format.") else xrm_option = (unsigned char *) 0; xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS); -#if defined (HAVE_X11R5) && ! defined (NO_XRM_SET_DATBASE) +#if defined (HAVE_X11R5) || defined (HAVE_XRMSETDATABASE) XrmSetDatabase (x_current_display, xrdb); #else x_current_display->db = xrdb; -- 2.30.2